oxenstored: Remove support for PQ defined operations.

It is unused.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson.citrix.com>
Committed-by: Ian Jackson <ian.jackson.citrix.com>

diff --git a/tools/ocaml/libs/xb/op.ml b/tools/ocaml/libs/xb/op.ml
index 97e38f236e8b6df25df2c686c1a753e1172945eb..1ce72da3482e618cc4715a3a753616248731e5c1 100644 (file)
--- a/tools/ocaml/libs/xb/op.ml
+++ b/tools/ocaml/libs/xb/op.ml
@@ -22,9 +22,6 @@ type operation = Debug | Directory | Read | Getperms |
                  Resume | Set_target
                | Restrict 
 
-(* There are two sets of XB operations: the one coming from open-source and *)
-(* the one coming from our private patch queue. These operations            *)
-(* in two differents arrays for make easier the forward compatibility       *)
 let operation_c_mapping =
        [| Debug; Directory; Read; Getperms;
            Watch; Unwatch; Transaction_start;
@@ -34,12 +31,6 @@ let operation_c_mapping =
            Resume; Set_target; Restrict |]
 let size = Array.length operation_c_mapping
 
-(* [offset_pq] has to be the same as in <xen/io/xs_wire.h> *)
-let offset_pq = size
-let operation_c_mapping_pq =
-       [| |]
-let size_pq = Array.length operation_c_mapping_pq
-
 let array_search el a =
        let len = Array.length a in
        let rec search i =
@@ -50,14 +41,10 @@ let array_search el a =
 let of_cval i =
        if i >= 0 && i < size
        then operation_c_mapping.(i)
-       else if i >= offset_pq && i < offset_pq + size_pq
-       then operation_c_mapping_pq.(i-offset_pq)
        else raise Not_found
 
 let to_cval op =
-       try
        array_search op operation_c_mapping
-       with _ -> offset_pq + array_search op operation_c_mapping_pq
 
 let to_string ty =
        match ty with

diff --git a/tools/ocaml/libs/xb/xb.mli b/tools/ocaml/libs/xb/xb.mli
index 20fe762d5d21c9164ce6ca55c0be403ca6c45590..1dde52db1e317a0c3d9bd3951669791751501792 100644 (file)
--- a/tools/ocaml/libs/xb/xb.mli
+++ b/tools/ocaml/libs/xb/xb.mli
@@ -25,9 +25,6 @@ module Op :
       | Restrict
     val operation_c_mapping : operation array
     val size : int
-    val offset_pq : int
-    val operation_c_mapping_pq : 'a array
-    val size_pq : int
     val array_search : 'a -> 'a array -> int
     val of_cval : int -> operation
     val to_cval : operation -> int